From 87747598a6569092d4c871254398e2450f526bfd Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Thu, 26 Oct 2017 22:13:18 +0530 Subject: [PATCH] Refresh patch 1001, 2002 and 2004 with new upstream. --- debian/patches/1001_fix_spelling_errors.patch | 4 ++-- debian/patches/2002_disable-net-tests.patch | 2 +- debian/patches/2004_clean-cargo-deps.patch | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/1001_fix_spelling_errors.patch b/debian/patches/1001_fix_spelling_errors.patch index 6617e36b9..0f8c4727b 100644 --- a/debian/patches/1001_fix_spelling_errors.patch +++ b/debian/patches/1001_fix_spelling_errors.patch @@ -6,7 +6,7 @@ Last-Update: 2017-09-23 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/src/bin/search.rs +++ b/src/bin/search.rs -@@ -26,7 +26,7 @@ +@@ -28,7 +28,7 @@ Options: -h, --help Print this message --index INDEX Registry index to search in @@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --color WHEN Coloring: auto, always, never --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs -@@ -676,19 +676,19 @@ +@@ -693,19 +693,19 @@ bail!("virtual manifests do not define [package]"); } if me.lib.is_some() { diff --git a/debian/patches/2002_disable-net-tests.patch b/debian/patches/2002_disable-net-tests.patch index a2a0497f0..d08ff793a 100644 --- a/debian/patches/2002_disable-net-tests.patch +++ b/debian/patches/2002_disable-net-tests.patch @@ -54,7 +54,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ .file("Cargo.toml", r#" --- a/tests/test.rs +++ b/tests/test.rs -@@ -2194,7 +2194,7 @@ +@@ -2205,7 +2205,7 @@ execs().with_status(0)); } diff --git a/debian/patches/2004_clean-cargo-deps.patch b/debian/patches/2004_clean-cargo-deps.patch index 9afe8fbbd..cb3c8a183 100644 --- a/debian/patches/2004_clean-cargo-deps.patch +++ b/debian/patches/2004_clean-cargo-deps.patch @@ -11,9 +11,9 @@ Forwarded: not-needed This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml +++ b/Cargo.toml -@@ -51,12 +51,12 @@ - [target.'cfg(unix)'.dependencies] - openssl = "0.9" +@@ -58,12 +58,12 @@ + [target.'cfg(target_os = "macos")'.dependencies] + core-foundation = { version = "0.4.4", features = ["mac_os_10_7_support"] } -[target.'cfg(windows)'.dependencies] -advapi32-sys = "0.2" -- 2.30.2